Tests helpers moved to lib
Cleaned removed files from git