better tests and width handled