[WIP] Simplify tests