Fixed test bugs; tests will actually run now