Extend tests further