Added some configuration and simple tests