Added more unit tests. Found SALAMI annotation problem. All good.