Separate test without required parameters
Switch from :should to :expect syntax
Code-style improves