Tests, int/uint support, more logging