Fix the unit tests :)

You might want to look through these and check your happy before you pull it