Loading router class, fixing tests