Added a test and a list comprehension