little restyling
improved tests and removed impassable tests