Add final touches to newline pretty printing, add cleanup to unit testing