code compiles (fixed imports, spelling), updated make, added tests