META-501 updated unit tests
META-501 updated unit tests