{Peter} Unit Tests fixed AND Csabi's modifications are implemented