Refactored test project structure. Some tests still needs cleaning and additional assertions.