Added version
Updated tests