Merge pull request #18 from sigmavirus24/more-improvements

Clean up and actually run tests from fixtures