Changed OddOrEven and OddOrEvenTest to include additional constructors.