Completed friendship state tests and cleaned up views