Implement tests merge with master