Added testing on install and on save