Isolate options types test
Move help at the bottom
Add strict and auto-discovery support