Spinner fixes (test)