- Minor bug fixes
 - Added more tests