NOJIRA : Fixed test cases to fall in line with what the real world will
provide.