Simplified classpathscanner and fixed test