Changed test code

Added getCurrentLocation to see room name & changed some of the names of items & rooms.