making it compile
fixing up tests