Added missing spec tests
Fixed return types
Added confirmation validation