fix test libraries to have test scope
remove unused method
Merge remote-tracking branch 'origin/master'