Hack to get tests passing for now