Fix for test method