cleaned up various minor tests and unnecessary conditions