Add unit tests
Removed redundant files
Removed redundant imports