Changing some test naming and expect() usage.