Beginning warnings for #55
Some tests are improved but still have to be tested.