added data cleaner test, improved entry test