Refactoring Production Tests. Closes #103