Ceps: Adding more tests + modifying some parameters name