Removed and updated Rocky's from his suggestions
Removed test that needs DOM