timespi fix
more tests