Adding Class declaration and wrapping tested class #15