Fixed end-to-end tests, readded tracker comment, got client cli runner to compile.