Updated test system
Added nag system