Cleaned up tests a little.

Moved helpers to __init__, no point it being empty.