Fixed test discovery issues - invalid library names changed