[fix] Added missing OPTIONS method to the default methods
[fix] Code cleanup
[test] Validation tests