Added 6 more unit tests; resolved #380