Modified tests to (hopefully) pass on drone