Added testing files
Updated testing classes