Updated Unit Tests to actually run again.