Fixed/commented out old tests, should pass now