Start reworking tests a bit