Add tests and refactor the predictions list