Get rid of manual tests
Some more progress on tests