More unit tests and one annotation fix