Update feature plan
Updated class diagram
Add more test cases to Rubric