Added a bit of output styling
Fixed bug
And fixed unittests