remove unused vars + test fix