Started adding basic tests