Move original tests aside and add our own