Fixed input checking to pass tests, fixed card color tests