Added unit and acceptance test
Merge branch 'master' of https://github.com/cs373-spring-2014/netflix-tests