Refactored testsuit