Tests updated to current version
Cleanup
Compatibility with gws
Removed heading