- and modified spec
This way we simplify the view a little bit and replace some slow system tests with faster component tests.