ticket:3 Added more tests.