took out small methods in test_helper and combined
fixed merge conflicts and changed test_helper