Kill custom template for client specs
Add test-on-server, test-on-client tasks