initial version
Added test*