refactoring tests to use after & other small changes
removing console.log's