+1 for putting tests in the same package (not necessarily in this pull
request)