Fixed hardcode
Updated tests