Split up tests a bit more