add Tick unitests + fixes