Added a new test and fixed a couple other tests for consistency