Changed the test-cases to use testify