Merged with sample proj. Removed test inconvinient helpers