Better interface to strategies. Added some tests