adding tests and correcting errors
merging conflit files