Remove extra tests
Optimize tests