Update the code + preparation script for testing