refactor more specs to avoid using attributes; fix some attributes