Get the tests working, delete the useless ones