make handheld more unit testing friendly