refactor to use the testify framework....