added work on all files except tests