Some slight bug fix's in the TestApplication