Big code update with fix and test update