Replaced unit tests with a single better test