Added a few testing bits and pieces