Finish task with some tests, could do some more bdd test