Add test; minor fix