Added more tests, increased coverage