Fix faulty test.
Unit test tweaks.