Moved changes from test folder to correct place