Got some working tests