added private annotation
some fixes for test