fix errors, make single entry tests pass