All working with tests

Need to update to be in the new NX repo format and correctly handle the newer formats for test fixtures which have changed since this was written

Author: SimeonC