Renamed and expanded test in this new file