getting more unit tests working (DONE [4030 tests] so far)