Improved feature reader and source, added other test