Remove extra query
Test fixes