Fixed missing graphic from box2d test and re-factored the definition
classes to give them proper names.