Updated model and removed a failing validation
Recreated the framework and improving naming convention usage
updating with latest