Fixed main test in test class, update & robustness fixes to test data
factory.