[AP]{refactoring} Test cases cleanup and improvements