Add more helpers and correct existing ones.
Merge pull request #183 from sleeper/add_test_helpers

Add more helpers and correct existing ones.