Updated to use table-driven tests: d913ffe