Optimize tests
Fix removing problems