minor changes on tests, working things out