Added some simple tests and first functionality