Updated testing to include multiple possibilities