Structuring test into integration and unit tests
Deleted redundant files