made 'map' method protected so it can be reused by other test suites
cleaned up tests, updated to use setup/loop