fixes yaml test
removes cruft
fixes tests