Added some tests
commented imports