made maker unit tests compile, fixed some errors