Minor changes + new tests