AS7-3414: Adding unit test work