Reduce code duplication
Use nicer dimensions for testing