WIP3: Additional tests