reduction of several larger methods into helper methods.
changed several test names
remove unused tests