adding som meat to the bone
added some new tests