a few more tests, a few less consol.logs