More tests with a hint of refactoring

why commented out?