tests, fixes and more updates