Switching back to the old tests, as Bamboo does not like them at all.