Tidy some test and add some additional ones