Remove calculator test as well.
Unify handling of number displays, fix some imports.