reworked all tests