More aruba and acceptance tests

Managed to catch some issues with the environmental tests in Aruba