Added source folders and update Command Tests