Started extending with TDD practices