Added fixtures
Cleanup for demo purpose
Added comment