[BUG #7810] indentation and camelCase
[BUG #7810] fix loadTime annotation
[BUG #7810] more refinements and much more test classes