Fix tests, less hardcoding