Custom helper test, clean up a few things