hopefully fixed tests