correct platform name
fix use of class
fix engine
add new tests
change DocBlocks
Merge remote-tracking branch 'origin/testing' into test-with-crossjoin