WIP on further tests