add comments + remove unused code in tests