Removed error msgs
Better testing