Revert "Changed some tests"

This reverts commit 4b8b2c20f7b4abafd3dcd4dfbafa6775107d49ec.