20140620

update to simple and add test class