fixed tests, added new, should check the total