NFR tests and Tablelist fix