Split up the tests, changed a little bit of code