Optimized the Tests module a bit