Added more tests; improved coverage