Completed unit tests for extract methods