Fixes to test project