Attempt soultion
new tests