fix tests fail
some cleanup