Added basic tests
Optimized imports
Reformatted all code