wrapped up model testing and did some controller testing