Bamboo tests
Fix issues