Commented out non running tests