Fixes specs
Fixes tests
Fixes cukes