Added testing... with the test branch, and took out World with master