More tests

Fixed.