revamped specs. all passing