Update self tester and fix reported issues