More tests, removed uneeded pop from model method