Adapted the first three tests for compatibility with the new classes