Code cleanup
Match style of other specs
Update pipeline stuff
Combine validators
Make include/extend consistent
Remove superfluous require
Add tests for Core
Improve error messages