#586 more tests