Added test files removed a little NFM trickery