WIP: Increase test coverage