Fixed guard stuff so test suite can actually run