Commentary fixes, add more tests