Added tests fixed bugs and changed whitespace again to get better coverage insights