[fix] Corrected the validate method
[fix] Correctly remove keys in the .remove method
[test] More tests