Renamed test -> spec
Code formatting
Fixed groups vs options code