Make testing easier with static methods in model
More modular testing; 10 unit tests added