Starting some tests... needs work