Added first tests for Open Shop. Refactoring