#408 Add more tests