WIP: adds spec tests