start hacking on tests, slow progress