More tests reworked