Adding another test and fixing up others