0.7 Fixed tests