fix system tests, need a better way of testing without hardcoding expected time