Fix adding unique keyword value.
Remove unused code.
Refactor tests for SQL select queries.