Added some tests, fixed typo