Removed var_dump
Fixed code to match unit tests