Updated methods and new test classes for core logic within MARK II
model.