Change logic due to latest aster changes, update tests