Updated test, preparing for FTP stage