AkB2010Swiss 2nd-review of the main class and tests