VID-2013 fixing unit tests, adding Bucky mock