Fixing test, and expanding them.