Final junit correction for Michael - moved to test folder