Fixed so that the tests satisfies the demos for sprint 2
Fixed formatation