ADDED: more unit-tests, and updated existing ones to latest code