3 second timer for client, bugfix for ALL test support + minor bugfixes