Fixing up test project