Fixing Unit Test errors. Remove require and include calls. Clean up instanceof expected returns to NS class names.