add back st-ok and start writing tests