Move test to an appropriate location
Remove dumb duplicate old code