Some fix & moar tests