Nico was here. Refactored tests.