More adjustments... removed test project