US45-Integrate all classes into Main Class

Updating test suite