Reworked some tests