Fix Assignment Errors

Create Unit tests and Fix Errors