fixed an issue with project. Added more tests.