more unit tests woo-hoo v2.0