Commented out additional tests