Feature/spec fixes

WIP
:+1: