remove unused annotation
move tests