cleaned tests up