Fixed tests for new custom toolbar