Fix up tests to actually run and work