Andrew: Added Basic Unit Tests