More tests + commentary