Test refactor done for all tests

sub by chris and sam