Mostly work on tests. should have committed this days ago...