Finalized test context, imported all test subjects to Junit environment and fixed xml typos