Biome related staff refactored and covered with tests