Started to rewrite the tests