[#33] Added private scope and tests; improved public scope tests; removed unnecessary lines