Continue test combination, point several bugs and TODOs in
MainClient.java