[BUGFIX] Move files from tests to Tests