Expand test suite and improve performance