AL: modified and fixed tests