Working on addressing the failing tests.