Adding testing, other fixes