added Prediction and more tests