Merge with new tests, fix pathing issues