Added more testing for current features