changes applied based on those made to armada - tests all running