minor tests re-factoring