WIP fixing 'new' handling; add two tests showing existing bug