remove ignore
consolidate tests
add text
rename some entry points