Remove str
Refactor test
Fix using test table