Removed extra steps and refactored my tests thanks to Maul.