Updated waterfilling_model_test to reflect changes to waterfilling_model.py