Added integration test and unit testing bits...