fixes for tests and fabfiles