Renamed var
Implemented whitelist logic
Fixed broken spec