Minor changes (nothing new)
Fixed some tests