Added tests
Improvemnets to more closely match wc