Added Some Unit Tests