- More work on default case + tests