altered tests for less duplication