Adding back tests and alternate distributions