Expand and fix testing