* rearranged testing to be less redundant