added more tests, changed the MZ file to more appropriate
added new fn
added new fn