Added Mock tests and classes