Added tests for HMC and started organizing rest of tests