Make true tests and fixes #52