refactored tests. sexy sexy