Modified the tests just a little bit