More tests while I wait for someone to merge my code