Refactored tests
Added optional name to When