Enabled octaves in mode generation & improved tests accordingly