Definitely need to introduce the missing classes even for test purposes to avoid having class mechanics bugged during release.