Added type condition tests (initial simplification)
Added som more documenatation