Fixed #12 Moded reusable classes to generator from tests