#5 - Convert remaining mock classes