add even more tests and remove double check