Tidied up basket test