Removed old testers
Modified imports and small merge bug