Added few more org tests