Apitests tidy ups