Test is still pretty poor, can it be improved to do something?