Removed dependency to GUUID-Applier and cleaned up test cases (#2)