Add waypoint support.
Add tests for Waypoint generation
fixed test
Refactored SimpeFactoryTest
Total refactoring of SimpleLevelFactory