removed tests, rewrote check for existing entry