Testing and reverting stuff ...