Merge "New junits and bug fixes"