final src and test changes
merged new files