Minor fix and adding basic tests