Minor updates, tests