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