Refactor tests #6
Refactor manager class #6