WIP: Remove tests