Exactly. Those are my litmus tests too.
Where I tend to differ from what one normally sees as "Libertarian" is that I believe unregulated businesses, as espoused in the libertarian ideals of a Free Market, will become oppressors of their employees and the communities they're expected to serve.
I feel a government should eradicate any law that restricts any personal freedom that doesn't infringe on the freedom or safety of others, while having strict regulations on businesses in relation to monopoly laws, employee well-being and market manipulation.