Feature/1 remaining specs

@kvirani