Converted unit tests to new 'should' way