@Luc Martin --- most tests done