Now able to run tests, but not finished yet