Expand specs, adding tests for utils