Working on fresh hyperGM test
Working on getting new hyperGM test to the user
Merge with branch Joeri Master