Added first load check
Removed tests