More tests. And a fix for a failed test!