Added some tests
Everythin working and looks good