Cleanup
Don't allow inactive API users to use the API
Add more specs
Add attributes to output factory