Debug message boxes removed + test code merged