XD-1853: Tap Fixture refactoring