refactors tests. adds test for rock