#5: Add additional tests