Minor changes and more testing