added weekend test and factors