Updated for Jasy-1.1
Fixes and code corrections for unit tests