fixed tests, commented out old tests