Better support of Scripting API
Some tests moved as JUnit tests