Small name changes
Remove some inline testing code