Master tests refactored, JSON objects changed to Slave everywhere