completed non-group tests & refactorings