Added tests and uuid validation