More work on specs

Just getting full test coverage