movies viewed features
adding more tests
fixed mistakes
fix conflicts