adding more tests; removing hard checks