Knocked out some more tests