cleanup. remove redundant tests, removed some describe blocks.