|#00| fixing functional tests, modifying product code