API Tests, fix triggers
Make it so 'invalid states' don't happen