Fix paths, add basic tests