some fixes for testing
deleted commented lines