Changed tests to tdd