Added version and cleaned up tests