Main files
Add proper test handling
General updates