more test factoring and removed files not using anymore