all tests running, need to sort out inconsistencies