Unit testing uncommented