Some tweaks and initial spec tests