#285 Added more tests
#285 Added more tests