continuing test refactoring
more progress on test refactoring
merging from remote