Updated tests (yet non-functional).