More tests written and working.  Now onto stored* objects