Cleaning up master for test