First stab at adding tests