Better layout for tests & hipchat bot