Fixes, test updates, readme updates