Fix bug with object keys, improved test and cleanup of this repo