Merged test with master