cleaned up tests and fixed augment to work with permissions, etc.