Adds more tests for <count>, modifies code format