Added some tests
Added #15
Added #16
Added #17