Deps for testing
Adds specs
Tweak tasks
Fixed templates