Fixed issues that prevented test from running