Finish many additional test classes for MARK II :)