Create test_master

merged 2 branches