#27 Added more tests