Change tests to TDD