Updated in preperation for release adding better tests.