Add in path fix + update tests