Add more testing

This should help me figure out why things appear to fail sometimes.