Added Then + tests