Removes one test and simplifies initialize