WIP for fixing some tests