Fixed build bugs with test project