make exec and add tests