Fixes in test project