Added conditional running of single test
Added more coverage and made some api tweaks