Edited unit tests to cover friendship feature
Fixed disc_test, had old manufacturer attribute thats been replaced with company_id