Made imports more generic for junit