Hacked in sound, removed CPPTest from solution