Updated Test Functions