Refactoring tests to use Grafaces