Changes to beautify filters to handle changes to avocado API

Signed-off-by: Sheik Hassan <solergiga@yahoo.com>