startKeepaliveTimer now starts keepalive timer, some minor changes in tests, removed outdated TODO