Deprecate test
Remove useless finals
Escape simple quote
Migrate query methods