updated all files with methods and tests stage 1