Add more through tests