made the tests actually run and fixed a bug!