Complete the Unit Tests