Removed the example guideline
Reorganized tests