Move build tasks into make targets
Move to spec-style unit/integration tests