Added test project and code cleaning