Restructuring tests
Merge branch 'master' of https://github.com/harrysouthworth/margarita
Export print method

S3 methods must be @export'ed.