Finished adding unit tests; removed separate test helper class