added a few tests after discussions with @betehess & @deiu