Minor changes & tests