Separate production and test