moved Test Cases and other edits