modified test in new branch
capitalized the first letter
solved conflits, merged two branches