Fix / clean up specs