Clean up tests. Updates for Spree 2.4