adding some tests - and thinking of ones we need to write