(fix) working tests