added test for non-globalized Gibber. added minimized version. general refactoring