Separating out the testing code.  It's still not working :-(