fixing main test
more fixups