Renamed the logger (checkstyle warning)
Made the test more robust, no longer dependant on waiting