Test Completion

Removed old comments and chained the tests together in the test
function.
Missing Constructor

Added a missing constructor