fix for tests

Fix tests to gain higher test performance