Added some tests
Working