More tests, better comments