Refactors Restroom initializer and tests