strengthened more tests