Fixed tests (didn't correct variable correctly)
Added working code