added extension strategy and some tests