Update project config files
Unit test refactoring
Adding some simple test cases