lets try this again  Fixed some tests
cmon man