enforce waterbutler path requirements /..[/], updated tests, helpers to private methods