RichardH : refactored instance creation code from Fixture to factories. Introduced Fixture into boostrap to create base diagram.