Update specs and remove specs that are now integration tests