Fix exec in source, updated some tests