removed hardcoded thingy and fixed tests