Extended testing and fixed tests