Some improvement for autometests

Add TODO
fix for automtests without BS
remove useless variable