refactorings moonshine base class
refactorings mock classes
adds filter class