Rogier

Added tests