Fixed bug in wrap which removed ; from end of find commands, added more unit tests