Completed Wiz unit tests