Comments
Adding conditional and autosize tests

Also cleanup other tests