Change test names and use Should assertions