More tests, minor modifications on code
Fix on scripts