WIP: Add tests