Updated test functions