Added tests. #TDD